Fix two remaining Windows untrusted search path cases #1792
+289
−84
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.